Auto merge of #4214 - msehnout:master, r=matklad

Infer multi-file binaries like `src/bin/server/main.rs` by convention

This feature is described in issue #4086

diff --cc src/doc/manifest.md
Simple merge

diff --cc tests/build.rs
Simple merge